Don't access the level after removing the node, since that may kill the

Mon Feb  2 23:41:48 2004  Matthias Clasen  <maclas@gmx.de>

	* gtk/gtktreemodelfilter.c (gtk_tree_model_filter_row_changed):
	Don't access the level after removing the node, since that may
	kill the level.  (#132615, Crispin Flowerday)

diff --git a/ChangeLog b/ChangeLog
index 59d145c36ad9c256d067d09effbe0534f0177ddd..db628791e7d9d74fdc2d283a860e457b3240f438 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Mon Feb  2 23:41:48 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtktreemodelfilter.c (gtk_tree_model_filter_row_changed): 
+       Don't access the level after removing the node, since that may
+       kill the level.  (#132615, Crispin Flowerday)
+
 2004-02-02  Tor Lillqvist  <tml@iki.fi>
 
        * gdk/win32/gdkevents-win32.c (gdk_pointer_grab): Set the cursor

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 59d145c36ad9c256d067d09effbe0534f0177ddd..db628791e7d9d74fdc2d283a860e457b3240f438 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+Mon Feb  2 23:41:48 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtktreemodelfilter.c (gtk_tree_model_filter_row_changed): 
+       Don't access the level after removing the node, since that may
+       kill the level.  (#132615, Crispin Flowerday)
+
 2004-02-02  Tor Lillqvist  <tml@iki.fi>
 
        * gdk/win32/gdkevents-win32.c (gdk_pointer_grab): Set the cursor

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 59d145c36ad9c256d067d09effbe0534f0177ddd..db628791e7d9d74fdc2d283a860e457b3240f438 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,9 @@
+Mon Feb  2 23:41:48 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtktreemodelfilter.c (gtk_tree_model_filter_row_changed): 
+       Don't access the level after removing the node, since that may
+       kill the level.  (#132615, Crispin Flowerday)
+
 2004-02-02  Tor Lillqvist  <tml@iki.fi>
 
        * gdk/win32/gdkevents-win32.c (gdk_pointer_grab): Set the cursor

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 59d145c36ad9c256d067d09effbe0534f0177ddd..db628791e7d9d74fdc2d283a860e457b3240f438 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+Mon Feb  2 23:41:48 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtktreemodelfilter.c (gtk_tree_model_filter_row_changed): 
+       Don't access the level after removing the node, since that may
+       kill the level.  (#132615, Crispin Flowerday)
+
 2004-02-02  Tor Lillqvist  <tml@iki.fi>
 
        * gdk/win32/gdkevents-win32.c (gdk_pointer_grab): Set the cursor

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 59d145c36ad9c256d067d09effbe0534f0177ddd..db628791e7d9d74fdc2d283a860e457b3240f438 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+Mon Feb  2 23:41:48 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtktreemodelfilter.c (gtk_tree_model_filter_row_changed): 
+       Don't access the level after removing the node, since that may
+       kill the level.  (#132615, Crispin Flowerday)
+
 2004-02-02  Tor Lillqvist  <tml@iki.fi>
 
        * gdk/win32/gdkevents-win32.c (gdk_pointer_grab): Set the cursor

diff --git a/gtk/gtktreemodelfilter.c b/gtk/gtktreemodelfilter.c
index 89b7e1a57e9233a07691bfbeaeec98b238fdad99..0c9c9031c2f461b08ca6004f08f98fb3f211294c 100644 (file)
--- a/gtk/gtktreemodelfilter.c
+++ b/gtk/gtktreemodelfilter.c
@@ -1079,13 +1079,14 @@ gtk_tree_model_filter_row_changed (GtkTreeModel *c_model,
     {
       /* get rid of this node */
       gtk_tree_model_get_iter (GTK_TREE_MODEL (filter), &iter, path);
-      gtk_tree_model_filter_remove_node (filter, &iter, TRUE);
 
       level = FILTER_LEVEL (iter.user_data);
 
       if (!level->parent_level)
         filter->priv->root_level_visible--;
 
+      gtk_tree_model_filter_remove_node (filter, &iter, TRUE);
+
       goto done;
     }